From 676576d8b841485141ecc362e31d5eaa6278ab7a Mon Sep 17 00:00:00 2001 From: robertl Date: Thu, 10 Oct 2002 05:43:39 +0000 Subject: [PATCH] Open Palm files in binary format for lame-o OS'es that distinguish between files access consisting of what you mean vs. what they think you mean. --- gpsbabel/cetus.c | 12 ++++++++---- gpsbabel/gpspilot.c | 4 ++-- gpsbabel/magnav.c | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gpsbabel/cetus.c b/gpsbabel/cetus.c index 06ebac9c7..eb3a834c2 100644 --- a/gpsbabel/cetus.c +++ b/gpsbabel/cetus.c @@ -62,7 +62,7 @@ struct pdb_record *opdb_rec; static void rd_init(const char *fname) { - file_in = fopen(fname, "r"); + file_in = fopen(fname, "rb"); if (file_in == NULL) { fatal(MYNAME ": Cannot open %s for reading\n", fname); } @@ -77,7 +77,7 @@ rd_deinit(void) static void wr_init(const char *fname) { - file_out = fopen(fname, "w"); + file_out = fopen(fname, "wb"); out_fname = fname; if (file_out == NULL) { fatal(MYNAME ": Cannot open %s for writing\n", fname); @@ -147,8 +147,12 @@ cetus_writewpt(waypoint *wpt) strncpy(rec->ID, wpt->shortname, sizeof(rec->ID)); rec->ID[sizeof(rec->ID)-1] = 0; - strncpy(rec->name, wpt->description, sizeof(rec->name)); - rec->name[sizeof(rec->name)-1] = 0; + if (wpt->description) { + strncpy(rec->name, wpt->description, sizeof(rec->name)); + rec->name[sizeof(rec->name)-1] = 0; + } else { + rec->name[0] = 0; + } if (wpt->creation_time) { tm = gmtime(&wpt->creation_time); diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.c index bf1b669c2..4d140d78e 100644 --- a/gpsbabel/gpspilot.c +++ b/gpsbabel/gpspilot.c @@ -43,7 +43,7 @@ struct pdb_record *opdb_rec; static void rd_init(const char *fname) { - file_in = fopen(fname, "r"); + file_in = fopen(fname, "rb"); if (file_in == NULL) { fatal(MYNAME ": Cannot open %s for reading\n", fname); } @@ -58,7 +58,7 @@ rd_deinit(void) static void wr_init(const char *fname) { - file_out = fopen(fname, "w"); + file_out = fopen(fname, "wb"); out_fname = fname; if (file_out == NULL) { fatal(MYNAME ": Cannot open %s for writing\n", fname); diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c index 93cd69c70..39c57e9e3 100644 --- a/gpsbabel/magnav.c +++ b/gpsbabel/magnav.c @@ -57,7 +57,7 @@ struct pdb_record *opdb_rec; static void rd_init(const char *fname) { - file_in = fopen(fname, "r"); + file_in = fopen(fname, "rb"); if (file_in == NULL) { fatal(MYNAME ": Cannot open %s for reading\n", fname); } @@ -72,7 +72,7 @@ rd_deinit(void) static void wr_init(const char *fname) { - file_out = fopen(fname, "w"); + file_out = fopen(fname, "wb"); out_fname = fname; if (file_out == NULL) { fatal(MYNAME ": Cannot open %s for writing\n", fname); -- 2.30.2